Merge remote-tracking branch 'origin/master' into feature/package+vc

author Philip Kaludercic <philipk@posteo.net>

Fri, 12 Aug 2022 14:05:05 +0000 (16:05 +0200)

committer Philip Kaludercic <philipk@posteo.net>

Fri, 12 Aug 2022 14:05:05 +0000 (16:05 +0200)
author Philip Kaludercic <philipk@posteo.net>
Fri, 12 Aug 2022 14:05:05 +0000 (16:05 +0200)
committer Philip Kaludercic <philipk@posteo.net>
Fri, 12 Aug 2022 14:05:05 +0000 (16:05 +0200)
diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge
diff --cc lisp/emacs-lisp/package.el
Simple merge
diff --cc lisp/vc/vc-git.el
Simple merge
diff --cc lisp/vc/vc.el
Simple merge
author	Philip Kaludercic <philipk@posteo.net>
	Fri, 12 Aug 2022 14:05:05 +0000 (16:05 +0200)
committer	Philip Kaludercic <philipk@posteo.net>
	Fri, 12 Aug 2022 14:05:05 +0000 (16:05 +0200)
		1	2
lisp/emacs-lisp/bytecomp.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/package.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-git.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc.el	patch \|	diff1 \|	diff2 \|	blob \| history